Auto merge of #2317 - alexcrichton:install-current-crate, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 25 Jan 2016 19:06:18 +0000 (19:06 +0000)
committerbors <bors@rust-lang.org>
Mon, 25 Jan 2016 19:06:18 +0000 (19:06 +0000)
Rolling together https://github.com/rust-lang/cargo/pull/2205 and  https://github.com/rust-lang/cargo/pull/2240


Trivial merge